Fix it correctly